Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 08:11:03 +0000 (08:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 08:11:03 +0000 (08:11 +0000)

Trivial merge